Just need to merge with the latest master
Merge branch 'master' into importer-of-exporter

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/i18n/messages_fr.properties
A marge with master
merge with master
fixed the error reporting on the file upload. Refactored the error handling to the AbstractFileUploadController
removed big file and eclipse-plugin
Merge branch 'fixing-error-messages-refactoring-upload-scripts-hotfix' of github.com:fterrier/kevin into fixing-error-messages-refactoring-upload-scripts-hotfix
properties changed
tweaked report tooltip code to display both en and fr
updated .gitignore to ignore classpath and project files
merged master and fixed conflicts
added fix for 'floating' stacked bars due to target option values totaling < 100%, and updated tests
floating  bar chart test
reverted 2 commits and added back .classpath file
updated tests, added additional location to initializer and integration tests for more fct data variety, added total average to fct table to calculate across all target options, which is needed to sometimes create a margin for a set of stacked bars in the fct location bar chart to stop them from floating
minor renaming to simplify
merged with origin/master and fixed conflicts
merged with origin/master and fixed conflicts
fix to hide the report value for when the bar chart height is less than 6%, thus too small to contain the text, and updated tests to detect this case
Error management hotfix