Merge branch 'master' into ionic
Cleaned up ionic assets and phonegap build config