first push
rset cache ignore
Merge branch 'master' of https://github.com/technical/playsms.y4k.co

Conflicts:
	plugin/themes/common/templates/page_welcome.html