Merge branch 'hotfix/0.6.1'
Merge branch 'develop'
Merge branch 'release/0.7.0'
#70 remove tomdocs
Merge branch 'release/0.8.0'

Conflicts:
	lib/cybele/version.rb
Merge branch 'release/0.9.0'

Conflicts:
	lib/cybele/app_builder.rb
	lib/cybele/generators/app_generator.rb
Merge branch 'master' of github.com:kebab-project/cybele into develop