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

forgot the favicon, will go in next dev merge

fixed mongo connection string

typoooo
rebase and cleanup for 0.3.0 release
Merge branch 'master' into dev

Conflicts:
	server/config/env/production.js