Altes Layout reimplementiert in foundation5
Merge branch 'master' of https://github.com/aladin/rails-crm
after merge
Conflicts:
	log/development.log