push to new os cartigridge
2try
returned openshift custom version
latest changes for swift openshift deploy
Added DB string for wercker tests
Fregging semicolon
Added openshift DB connection
asset management on a json
build system working
build system and production integration
Merge branch 'master' into dev

Conflicts:
	server/config/env/production.js
quick fix for 0.3.0
quick fix for 0.3.0
Merge branch 'dev' of github.com:bbaaxx/codetitlan-blog into dev