Merge remote-tracking branch 'upstream/master'
Updates to use new system property replacement when loading json
Updated arquillian version
Merge pull request #18 from jewzaam/pr-system-properties

Updates to use new system property replacement when loading json - Travis claims some errors during the tests but Naveen and I weren't able to reproduce it, merging to check if it was a mistake made by travis
Merge remote-tracking branch 'upstream/master'
Updated the lightblue version
Merge pull request #24 from luan-cestari/FIX_POM

This runs fine locally, Travis is out to lunch.