mmmmmm
Merge branch 'master' of http://github.com/seydar/soobee

Conflicts:
	edit_text.js
fuck this shit