have gradle to create spring_loaded/springloaded-jhipster.jar
have gradle to create spring_loaded/springloaded-jhipster.jar
Bug fix #413
Readd missing if
Merge pull request #422 from LeovR/patch-2

Readd missing if
Bug fix #416

Two new dependencies were not installed
Merge pull request #410 from ndjordjevic/gradle_spring_loaded

Gradle spring loaded
Replace the hardcoded version
Bug fix #421
Bug fix #423
Declare as a bean the Hibernate4Module class

 Bug Fix #415
Update to springboot 1.1.4

Bug fix #420
Update springboot to 1.1.4.RELEASE
Spelling fix - Administrator
Spelling fix - Administrator
Spelling fix - Administrator
Merge pull request #425 from arafalov/arafalov-spelling-fix

Fix misspelt 'Administrator' on the home page
Merge branch 'upstream'

Conflicts:
	app/templates/_gradle.properties