Added Ionic Base
Merge branch 'local-master'