a
Merge branch 'mlh_alex'

Conflicts:
	MLH/src/android/mlh/bl/tasks/Task.java