Added license, fixed an import
Merge branch 'master' of github.com:xyproto/genericsite

Conflicts:
	LICENSE