Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.js
	app/templates/src/main/webapp/_index.html
	app/templates/src/main/webapp/scripts/_app.js
	app/templates/src/main/webapp/scripts/_controllers.js
	app/templates/src/main/webapp/scripts/_services.js
	app/templates/src/main/webapp/scripts/client/app/account/settings/settings.html
Merge remote-tracking branch 'origin/master'
Unnecessary ; (Fix #2)

Leave it blank "", "#" will redirect to home page 

Please, test the code after reverting.

So, the correct way was href="" and not href="#" or href="javascript;",
Update _index.html
various fixes for the metrics screen

add the missing 'usage' key and value in i18n files
rename wrong overriding threadDump assignation in angularJS scope
use right key in thread dump view for 'runnable' (from 'waiting')
change translate method to prevent bug in IE11 (see http://stackoverflow.com/questions/20647572/angularjs-v1-2-5-script-error-with-textarea-and-placeholder-attribute-using-ie11#answer-23574588)
add the missing 'usage' key and value in i18n files
rename wrong overriding threadDump assignation in angularJS scope
use right key in thread dump view for 'runnable' (from 'waiting')
change translate method to prevent bug in IE11 (see http://stackoverflow.com/questions/20647572/angularjs-v1-2-5-script-error-with-textarea-and-placeholder-attribute-using-ie11#answer-23574588)
various fixes for the metrics screen

add the missing 'usage' key and value in i18n files
rename wrong overriding threadDump assignation in angularJS scope
use right key in thread dump view for 'runnable' (from 'waiting')
change translate method to prevent bug in IE11 (see http://stackoverflow.com/questions/20647572/angularjs-v1-2-5-script-error-with-textarea-and-placeholder-attribute-using-ie11#answer-23574588)
Upgraded to Spring Boot 1.2.0.RC2
Merge branch 'patch-3' of github.com:BaleroCMS/generator-jhipster into BaleroCMS-patch-3
Merge branch 'BaleroCMS-patch-3'
Merge branch 'fixes-for-metrics' of github.com:unknownboy/generator-jhipster into unknownboy-fixes-for-metrics
Used committed memory as a max for non-heap (as there is no max)
Merge branch 'unknownboy-fixes-for-metrics'
Added DB_CLOSE_DELAY=-1 to the H2 connection string

Fix #788
Merge branch 'master' into v2.0
Merge branch master into v2.0