Creating template
Merge branch 'master' of ssh://econofam-zherkingdom.rhcloud.com/~/git/econofam

Conflicts:
	.openshift/cron/README.cron
	.openshift/cron/weekly/jobs.allow
	config.ru
Update gem source for openshit
clean bundle
Compiled assets
sqlite
small fix
Price variation calculation