Removed dependency on ant
Undoing changes to startup.properties
Merge branch 'master' into inmobi