edit article, register changed styles, article service changed messages
Merge branch 'master' of https://github.com/jkamcc/magazine-spring

Conflicts:
	client/src/main/webapp/resources/js/edit_article.js