add current user to cropzone
added the models
added trail.bookmarks to scope
finished with adding user stuff, branch done
final
Merge branch 'master' into addowner

Conflicts:
	log/development.log

ok
remove binding.pry
add of uploaded by info