tuesday merge
Merge branch 'master' into ryan

Conflicts:
	app/config/database.php
fix merge issue
Merge pull request #8 from 210geeks/ryan

Ryan
added device controller, master, login, panel view
Merge pull request #9 from 210geeks/Joseph

added device controller, master, login, panel view
Merge pull request #10 from 210geeks/izzy

Izzy
Merge branch 'master' into izzy