Fixed robot collision with android when standing still
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2

Conflicts:
	Assets/Finished Levels/lvl3-2.unity