Merge branch 'master' of https://github.com/BohdanMaslowski/praetor-ionic