App title changed
Merge branch 'master' into dev

Conflicts:
	www/config.xml
Dirs for Meteor added