- Add 2-state and 8-state text input views and their corresponding joystick calibration views
Merge branch 'master' of https://github.com/admachina/AwesomestTeam-Communication-Aids

Conflicts:
	iOSCode/Communication_Aid/Classes/ProfileViewController.m