Merge pull request #5 from kwhatmough/next

Make demo configuration names consistent with libs.
Update for BlackBerry 10.
Merge pull request #8 from kwhatmough/next

Update for BlackBerry 10.
Merge branch 'next'
Merge pull request #9 from kwhatmough/master

Merge next into master