Merge branch 'release/v0.1.0'
Merge branch 'develop'
index.html deleted
Merge branch 'develop'

Conflicts:
	test/functional/sessions_controller_test.rb
Merge branch 'develop'
Bugfix deployment on Heroku