font-awesome, ux picture
Merge branch 'develop' of github.com:VoIPGRID/civili into develop
update paths
adding aws
unicodes added
picture in form
Merge branch 'develop' of github.com:VoIPGRID/civili into develop
organization file, map fix grey
First markers on the map!
Merge branch 'develop'

Conflicts:
	frontend/public/js/civili.js