Database (Create Merchant Account)
Merge branch 'master' of https://github.com/lockonostratos/zeprj

Conflicts:
	.idea/workspace.xml
	app/models/account.rb