Merge pull request #4 from bamiano/master

fixed models and associations
mid day update Dec 15
mid day update Dec 15
Merge branch 'master' of https://github.com/MPMoughan/appseller

Conflicts:
	config/routes.rb