updated version to 1.2.0
Merged 'dev'.
Merged 'dev'.
Finish protractor-update