fix sp
Merge branch 'master' of https://github.com/freelook/EVENTA

Conflicts:
	public/modules/speakers/controllers/speakers.client.controller.js