items controller
updated db config
Merge branch 'master' of https://github.com/ekurutepe/megafon

Conflicts:
	config/database.yml
Merge branch 'master' of https://github.com/ekurutepe/megafon