:fix
Merge branch 'master' of git://github.com/oliverlloyd/parsilo

Conflicts:
	public/parsilo.appcache