Merge pull request #14 from slandelle/master

Just a few tweaks, Thanks to @slandelle
Added maven 'demo' and 'qual' profiles.
Merge pull request #16 from zepag/master

Added maven profiles for 'demo' and 'qual'.