Clean import
Prepare v1.1.0
Merge branch 'master' of https://github.com/soapower/soapower
Prepare v1.1.0
Merge branch 'v1.1.0' of github.com:soapower/soapower into v1.1.0
Update restart.sh
Update restart.sh
Update restart.sh
Update restart.sh
Update restart.sh
Update restart.sh
Version stable 1.0.2
Merge branch 'v1.0.2'

Conflicts:
	project/Build.scala
Merge branch 'master' of github.com:soapower/soapower
Fix URL Bintray
Merge branch 'master' into angularJS
Init new views with Angular JS - work in progress
Work in progress - Angular JS (stats and begin admin page)
Work in progress AngularJS on Admin
Work in progress - AngularJS