Merge
Removed extra linebreak in persistence
Merge branch 'dev' of https://github.com/VitoInfinito/codedark into dev

Conflicts:
	src/main/webapp/forum/app/js/controllers.js