Conflicts:
	.gitignore
	MANIFEST.in
	setup.py
	snf-ui/Brocfile.js
	snf-ui/app/index.html
	snf-ui/app/routes/application.js
	snf-ui/app/snf/settings.js
	snf-ui/ember-cli-synnefo.js
	snf-ui/package.json
	snf-ui/tests/index.html
	synnefo_ui/ui_settings.py
	synnefo_ui/urls.py