s
Merge branch 'master' of github.com:coepoe/glapp

Conflicts:
	assets/data lot.sql
stok lot div sql