Change the start time and end time CreateEventActivity
Merge branch 'master' of https://github.com/omg-insa/client

Conflicts:
	PlanYourParty/src/fr/insalyon/pyp/gui/events/CreateEventActivity.java

Resolve conflict CreateEventActivity
Merge branch 'master' of https://github.com/omg-insa/client