alot of shizzle
Merge branch 'master' of github.com:markthor/RentIt

Conflicts:
	RentItServer/RentItServer/SMU/SMUDao.cs
Merge branch 'master' of github.com:markthor/RentIt
Shitloads of shizzle
Merge branch 'master' of github.com:markthor/RentIt
.