adding <modules> to tiapp.xml files
Merge remote-tracking branch 'origin/master'