Removed theme css file - no need seperate css for that
Bootstrap from local sass added to applications.css
Renamed theme scss file
Merge branch 'feature/osc-improved-bootstra' into feature/theme-amelia

Conflicts:
	app/assets/stylesheets/theme.css