Merge branch 'master' of github.com:danlinde/sifiapp

Conflicts:
	app/assets/stylesheets/application.css.erb
Merge branch 'master' of https://github.com/danlinde/sifiapp
merged