Merge branch 'feature/tasks' of https://github.com/Acstylos/wpi-suite into feature/tasks
Patched to correct for naming errors. This commit is best commit! Change-Id: I0edb42e9eec91b84fe276ebec7891d8dee67ec3e