Database
Merge branch 'master' of https://github.com/lockonostratos/zeprj

Conflicts:
	.idea/workspace.xml
	app/assets/javascripts/initializers/current_account.js.coffee