Inital commit
Changed id
Fixed name
Trying to get android plugin to work
Merge branch 'master' of https://github.com/effection/wikitude-phonegap

Conflicts:
	plugin.xml
	www/WikitudePlugin.js