Merge pull request #162 from djuretic/master

Added tests for views/Options
Update appcache and version
Refactor options view using a template