Merge pull request #21 from afalsario/alex

Alex
Merge pull request #22 from afalsario/alex

Alex committing changes
adding dropzone for batch image uploading
fixed merge conflicts
Merge pull request #23 from afalsario/afalsario

Afalsario
fixed dropzone
Merge pull request #25 from afalsario/afalsario

fixed dropzone
Merge branch 'master' into alex

Conflicts:
	app/views/profile.blade.php
	app/views/profiles_index.blade.php