Edited the integration tests
Fixed merge conflicts
Added ProjectExpenseMappingFacadeRESTTest
Latest Merged
Merge branch 'master' of http://github.com/mikaelvg/bayanihan

Conflicts:
	src/test/java/ph/bayanihan/web/testutil/TestVariable.java