Closes ALOY-754

Themeable config.json
Fixed arg order
Removed ;
Updated basic/config_json test app
Moved testing app to /test/apps/testing/ALOY-754
Fixing typo causing non-themed config.json not working
Merge branch 'master' of https://github.com/appcelerator/alloy into patch-1

Conflicts:
	Alloy/commands/compile/compilerUtils.js
[ALOY-871] Custom TSS device queries
Add XML processing for custom conditionals
Fix for compilation error with some projects
[ALOY-938] Conditional TSS creates unexpected _.extend() calls
[ALOY-362] Allow controller-less views with some controller logic
ALOY-858b fix missing tiapp.xml
Merge pull request #361 from skypanther/ALOY-858B

ALOY-858b fix missing tiapp.xml
Merge pull request #246 from FokkeZB/patch-1

Closes ALOY-754
Merge pull request #355 from skypanther/ALOY-871

[ALOY-871] Custom TSS device queries
Merge pull request #357 from skypanther/ALOY-938

[ALOY-938] Conditional TSS creates unexpected _.extend() calls
Merge pull request #358 from skypanther/ALOY-362

[ALOY-362] Allow controller-less views with some controller logic