Changesd version to 17
Added EditEventActivity
Merge remote-tracking branch 'origin/master'