Upgrade to bootstrap 3.0.3
Merge remote-tracking branch 'ta/master'
Upgraded to the current version of unicorn 2.2.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/templates/dashboards/show.html.erb
	app/assets/javascripts/angular/templates/widgets/pernode/show.html.erb
	app/assets/stylesheets/unicorn.main.css
	app/controllers/apps_items_controller.rb
	app/controllers/cloud_books_controller.rb
	app/controllers/cloud_books_histories_controller.rb
	app/controllers/cloud_identities_controller.rb
	app/controllers/cloud_stores_controller.rb
	app/controllers/dashboards_controller.rb
	app/controllers/users_controller.rb
	app/views/cloud_books/_tab_actions.html.erb
	app/views/cloud_books/index.html.erb
	app/views/cloud_books/new_book.html.erb
	app/views/cloud_books_histories/index.html.erb
	app/views/cloud_stores/index.html.erb
	app/views/cloud_stores/new.html.erb
	app/views/cloud_stores/new_store.erb
	app/views/dashboards/index.html.erb
	app/views/market_place/_add_button.html.erb
	app/views/market_place/new.html.erb
remove the demo stuff of unicorn.
x-editable support for b3, prepend our js files with megam.*
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/templates/dashboards/show.html.erb
cross_cloud profitbricks addedd