Updated DB
 UpdatedMerge branch 'master' of https://github.com/iwebsource/myapp

Conflicts:
	.gitignore
	db/schema.rb