Merge pull request #130 from KurtStam/master

fix for https://bugzilla.redhat.com/show_bug.cgi?id=1043050
Place demo assembly into its own module; DTGOV-99
Merge pull request #131 from knrc/master

Place demo assembly into its own module; DTGOV-99