Changed some ## terms so they are replaced from build.properties file
Merge pull request #1 from joelmoniz/master

Changed some ## terms so they are replaced from build.properties file