Uconn 1

Contains all changes for UConn sprint 1 https://wikia-inc.atlassian.net/secure/RapidBoard.jspa?rapidView=28&view=reporting&chart=sprintRetrospective&sprint=361