Merge branch 'master' of git@github.com:jamesfleeting/CMS
Change functions in appController to camel case
Change db_results to dbResults
Finish camel case
Move code to change template location to url file, allows for admin error pages.
Load adminController instead of appController for 404 on no urlPattern
added readme file
Merge branch 'master' of github.com:jamesfleeting/CMS
Add database file to repo
Remove auto_increment
added default admin user and updated readme
changed article to event
typo fixed on event link
throw error of small image on News [Issue #13]
event bug fixes (fixed POST['id'] and added minWidth/Height from events model) // throw error on small image upload
added minWidth/Height from model // throw error on small image upload
added promo positions interface
promo positions restricted to super admin[id == 1] only (solution for now)
clean_html being used
fixed type