Postgres
Merge branch 'master' of https://github.com/filosofisto/mainframe-vc

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	config/application.rb
	config/database.yml
Merge branch 'master' of https://github.com/filosofisto/mainframe-vc
Merge branch 'master' of https://github.com/filosofisto/mainframe-vc

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	config/application.rb
	config/database.yml