Corrected Redirect after Registration
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft
adding CAD
BLAH
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft
Added DB Structure for today
Changed
Merge branch 'CAD'

Conflicts:
	protected/views/user/cad.php
Completed Profile Picture Task, uploading, resizing, cropping xD
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft
Fixed bugs
Fixed Bugs
BUUUUUUUUUGGGGGGGGGSSSSSSSS
Removed Add Money bug
Added Rights
Corrected Password Reset Bug
Corrected Password Reset Bug
Admin functions polished
Bug Fixes for Admin
Roles corrected via Admin page