Initial commit
Merge branch 'master' of github.com:orbotix/Sphero-AR-SDK into develop
Merge branch 'develop'
new .gitignore
Untracked files that are now ignored
Increased stability
Added back some removed functions, update once again gated by vision updates
ignoring things that should be ignored
it was crashing a lot, I dropped in the robot vision form rolling dead
removed files that shouldn't be tracked
no longer tracking iOS
Merge remote-tracking branch 'origin/master' into feature/fix_master_develop_discrepencies

Conflicts:
	.gitignore
	Frameworks/RobotVision.framework/.DS_Store
	Unity Sample/Assets/Plugins/.DS_Store
	Unity Sample/Library/EditorUserBuildSettings.asset
	Unity Sample/Library/ScriptMapper
	Unity Sample/Library/cache/9d/9db8ee10bafb7452d8617f80b11acf5a
	Unity Sample/Library/guidmapper
	Unity Sample/Library/metadata/45/458ee2d52baa7f14da4b5b5f9f26aed1
	Unity Sample/Library/previews/03/035a8130f4329504aaa80f75dc72628d
	Unity Sample/Library/previews/03/035a8130f4329504aaa80f75dc72628d_/100048
	Unity Sample/Library/previews/08/087a2ac1c75bbc34aa1d66d7766c1d5b
	Unity Sample/Library/previews/08/087a2ac1c75bbc34aa1d66d7766c1d5b_/100050
	Unity Sample/Library/previews/45/458ee2d52baa7f14da4b5b5f9f26aed1
	Unity Sample/Library/previews/45/458ee2d52baa7f14da4b5b5f9f26aed1_/100058
	Unity Sample/Library/previews/54/545baaf1c8c096e48a4fceadea866a1b
	Unity Sample/Library/previews/54/545baaf1c8c096e48a4fceadea866a1b_/100146
	Unity Sample/Library/previews/77/77faa5be20665f04da4f81197de56ee1
	Unity Sample/Library/previews/da/da7272eb982174944905bc546feabe8c
	Unity Sample/Library/previews/dc/dcdd9efcf7611a04092229da6a3ab488
	Unity Sample/Library/previews/dc/dcdd9efcf7611a04092229da6a3ab488_/100068
Merge branch 'feature/fix_master_develop_discrepencies' into develop
removing android support - won't be stable for public release
pulled ARUNBridge back over from rolling dead, there were typos
removed android references in ARuNBridge
Merge branch 'release/1.1.0'