Merge pull request #234 from jlipps/master

better error messages for unsupported tag names
Add Android to reset
Merge pull request #237 from bootstraponline/reset_android

Add Android to reset
allow custom activity string