ISSUE #8 - Unit-Test ConfigurationActivity
Merge branch 'issue-8'