first routing and test function /test
Merge branch 'master' of github.com:grigorecezar/MeetMon into api-1

Conflicts:
	api/.gitignore
	api/app/controllers/Application.java
	api/conf/routes
Merge branch 'api-1' of github.com:grigorecezar/MeetMon into api-1

Conflicts:
	api/.gitignore
get events based on search fields sent by user