merge
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/project.properties
Merge branch 'master' of https://github.com/sgattani/Group-Project
Merge branch 'master' of https://github.com/sgattani/Group-Project
view pager, view pager indicator, and card styling