.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/php25/JavaWebApi/service/AdminServiceTest.java