merge
Merge branch 'master' of https://github.com/prosidney/newfitness.git

Conflicts:
	src/main/webapp/WEB-INF/dispatcher-servlet.xml