custom fileupload
styling for fileupload
add loading gif
move picture controllers to dashboard
remove attachinary fields on user
remove fileupload middleware
add upload progress bar
conflict resolved
gemfile conflict resolved
Merge branch 'mauries'
create @users on card_create
Merge branch 'master' of https://github.com/Zwooosh/MT-Identity
Merge branch 'mauries' of github.com:Zwooosh/MT-Identity

Conflicts:
	app/views/dashboard/cards/edit.html.haml
Merge branch 'mauries'

Conflicts:
	app/views/dashboard/cards/edit.html.haml
Merge branch 'master' of https://github.com/Zwooosh/MT-Identity

Conflicts:
	app/views/dashboard/cards/edit.html.haml
remove merge conficts
Merge branch 'master' of github.com:Zwooosh/MT-Identity
resolved conflict
updated db schema.rb
added small details