codes fixed and added mm-awac-percentage-question
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	data_importer_resources/awac_data_17-07-2014/AWAC-entreprise-calcul_FE.xls
	public/javascripts/app.js
Merge remote-tracking branch 'origin/master'
codes fixed and added mm-awac-percentage-question
codes fixed and added mm-awac-percentage-question