Merge branch 'develop' of https://github.com/cyriltata/formr.org into develop
Merge remote-tracking branch 'upstream/develop' into develop
ignore more stuff
more abstraction for mymysql queries to make model less clumpsy
fetch row
Merge branch 'develop' of https://github.com/rubenarslan/formr.org into develop

Conflicts:
	Model/Pagination.php
	Model/User.php
move DB class to library, rewrite db queries for Models RunUnit and Branch
format sql queries for models Email and Email account, add method for mysql duplicate update
use singleton for DB object
Code formatting for Item Model, abstract queries in External Model
more code formatting and query abstraction for models
abstract SQL queries for survey models
cron fixes
sql formatting for Survey and Run models, create template for runs
use DB abstraction in RunSession model
move run HTML to template
change referrer type to TEXT, closes #98
format html in acp_nav
add site urls in helper_functions, some fixes after testing survey upload
autoformat