5 commits

Author	SHA1	Message	Date
Dane Everitt	fb8a26f141	Merge branch 'develop' into feature/api-daemon-changes	2017-09-25 21:46:44 -05:00
Dane Everitt	e56f4cdd33	Update license headers on files.	2017-09-25 21:43:01 -05:00
Dane Everitt	dd456a4c9c	Fix all currently failing tests	2017-09-24 22:28:16 -05:00
Dane Everitt	8f14ee989d	Apply fixes from StyleCI	2017-09-03 21:41:03 +00:00
Dane Everitt	37508a370d	Finish up unit tests for base controllers	2017-09-02 18:56:15 -05:00