adding the entities
changing the prod db and the user and password
changing the prod db and the user and password
changing the prod db and the user and password
changing the prod db and the user and password
changing the prod db and the user and password
Merge branch 'master' of https://github.com/demibenari/kicksight

Conflicts:
	config/routes.rb