tipakoroche
Merge remote-tracking branch 'origin/master'

Conflicts:
	SurfsUp/src/ru/andraft/surfsup/Rawik/RajawalilkaActivity.java
tipakoroch