git init
Merge branch 'develop'

Conflicts:
	app/models/user.rb
Merge branch 'release/0.0.2'
Merge branch 'release/0.0.3'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	app/models/user.rb
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
release 0.0.7
Merge branch 'hotfix/0.0.7' into develop