Changes to MainActivity, Task classes
Merge branch 'master' of github.com:elenaoat/msp

Conflicts:
	TaskManager/src/com/taskmanager/MainActivity.java
	TaskManager/src/com/taskmanager/NewTaskActivity.java