seek
Merge branch 'master' of https://github.com/eagle2088/crazySty.git

Conflicts:
	AndroidManifest.xml