Added phonegap serve support
Merge branch 'development'