updated post
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-12-07-jsf-2-2-primefaces-login-jaas-tomcat-example-project.md