Moved 'test' to 'demo'. Created separate 'build.xml'
Renaming: Test -> Demo
Merged changes