Modify page profile and search with dashboard so can use Web Service
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013

Conflicts:
	MOA_services/src/com/services/TaskService.java
	MOA_web/src_java/controllers/MainApp.java
Finally