Fixed error checking in Controllers
merge conflicts
Merge branch 'master' of https://github.com/jkabigti/asdfasdf

Conflicts:
	SL136/BLTest/AuthorizeServiceTest.cs