- Created dev branch
- On master, changed base url to "http://catchup-kreeos.rhcloud.com
Merge branch 'development'
Fixed typo in base url
Merge branch 'development'
Merge branch 'development'

Conflicts:
	php/application/config/config.php
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Changed mysql username and pw for master branch - open shift
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
no message
Merge branch 'master' into development