fix bugs
Merge branch 'master' of https://github.com/tamerelsayed/AIESEC-APP

Conflicts:
	.DS_Store
	sites/.DS_Store
	sites/all/.DS_Store
	sites/all/modules/.DS_Store
	sites/all/modules/custom/.DS_Store
	sites/default/.DS_Store