fixed #93
Merge branch 'master' of github.com:sharetask/sharetask

Conflicts:
	backend/src/main/resources/environment/dev/log4j.xml
	backend/src/main/resources/spring/applicationConfig.xml