Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

Merge remote-tracking branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

04.10.14

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

04/10/14

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

04/10/2014

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

4/01/2014
commit