Base front
Merge branch 'master' of https://github.com/pzread/sprout

Conflicts:
	.gitignore