Revert "war"

This reverts commit 6b62ec44ea05bfb600329f31e7bcf21530061398.
Merge branch 'master' of https://github.com/adinuca/public

Conflicts:
	taskManager/src/test/java/ro/reanad/taskmanager/service/JaxbServiceTest.java
Janrain login