a
b
Merge branch 'master' of https://github.com/boebu/ch.bfh.bti7054.w2013.q.RubyShop

Conflicts:
	config/database.yml

.a
added app_test model for basic integration tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/categories/_translation_fields.html.erb