Tons of work

Work on the computer end of the scouting. Nothing big, just groundwork
Eclipse configuration things
Merge remote-tracking branch 'origin/master'

Conflicts:
	ScoutingApp/app/src/main/res/layout/fragment_main.xml