Removed redundant code in database.php.
Forgot 5th argument to database creation.
Added options for google ads and analytics.
Removed useless $count from octapi (hhvm static analyzer report).
Merge branch 'master' of ssh://o-travvik.rhcloud.com/~/git/o
Merged with online. Problem with the advert credentials.
Conflicts:
	controller/credentials.php
Reverted merge. Likely introduced problems
Ran static analyzer and fixed problems with declaration of database object. Removed dead code in octapi.php
Added exception for the dreaded bad data from OC Transpo.