first commit
Merge branch 'master' of github.com:macdonst/MAD9135

Conflicts:
	.gitignore
	plugins/firefoxos.json