changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Add username and password to scm-manager path
oneapp is born.
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_books/new.html.erb