Sync forc
Merge remote-tracking branch 'upstream/master'
Added in workstation shortcut, discomfort views
Added a bodyparts class
Addeed constructor
Added Ryan's xml into mine.
Merge branch 'develop'

Conflicts:
	StraightComfort/src/main/java/com/jrs/StraightComfort/Utilities/Bodypart.java
Transition to display screen
Version 0.1, still on one critical defect
added action bar and layout changes
Changed padding
Changed padding
Added webview, selected view for menu items
Update scInfo.xml

Inputting welcome screen logic
Update scInfo.xml
fixing steves padding
Fixed padding
fix padding
Merge branch 'master' of https://github.com/jsh0211/StraightComfort-Android

Conflicts:
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin
changed discomfort page padding