last-update initial
last-update final
Merge remote-tracking branch 'origin/develop' into ionic-2