Remove .cordova folder
Remove hooks folder
Add information about start emulator
Update ignore file, add merges folder
Merge branch 'develop'

* develop:
  Update ignore file, add merges folder
  Add information about start emulator
  Remove hooks folder
  Remove .cordova folder