changes made, check tests
changes made, check tests
Merge branch 'fix_stampable_and_creator_association' of https://github.com/QutBioacoustics/baw-server into fix_stampable_and_creator_association

Conflicts:
	app/models/bookmark.rb
merged in master, fixed tests
changes made, check tests
changes made, check tests
merged in master, fixed tests
Merge branch 'fix_stampable_and_creator_association' of https://github.com/QutBioacoustics/baw-server into fix_stampable_and_creator_association
these damn merges
Merge pull request #103 from QutBioacoustics/fix_stampable_and_creator_association

Fix stampable, creator, archiving