Merge pull request #15 from adaptlearning/develop

Develop
Merge branch 'develop'

* develop:
  Fixed bug with iOS and other mobile devices - Fixed position on inputs
Merge branch 'master' into develop

* master: