Hallååå
Merge branch 'master' of https://github.com/MozFlygTeam/MozFlyg

Conflicts:
	MozFlyg.java