fancy
Merge branch 'master' of https://github.com/fancystudio/fancystudio

Conflicts:
	tmp/cache/module_meta.cache
Merge branch 'master' of https://github.com/fancystudio/fancystudio

Conflicts:
	tmp/cache/module_meta.cache