before merge
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/angular/views/user_data.jade
	app/eu/factorx/awac/controllers/AnswerController.java
	bower.json
	conf/components.xml
	conf/routes
	data_importer_resources/translations/translations_common.xls
	public/components/angular/.bower.json
	public/components/log4javascript/js/log4javascript.js
	public/components/log4javascript/log4javascript.js
	public/javascripts/app.js
fixed problems related to angularjs version
Persistence.xml - Synchronized classes list