BCrypt integrated,
Boilerplate removed
WebJars integrated with webjars-play and bootstrap 3.0.3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/User.java