bash.org added
remove bas.org
zadolbali fix.
Merge branch 'master' of github.com:sagol/umori.li

Conflicts:
	app/controllers/SitesData.scala