tuesday merge
Merge pull request #7 from 210geeks/Joseph

Set up new password
Merge branch 'master' into ryan

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

Ryan
Merge pull request #9 from 210geeks/Joseph

added device controller, master, login, panel view
Merge branch 'master' into Joseph