removed unecessary files
modified:   Gemfile
modified:   Gemfile.lock
modified:   app/assets/javascripts/application.js
modified:   app/assets/stylesheets/application.css.scss
deleted:    vendor/assets/javascripts/select2-release-3.2/LICENSE
deleted:    vendor/assets/javascripts/select2-release-3.2/README.md
deleted:    vendor/assets/javascripts/select2-release-3.2/index.js
deleted:    vendor/assets/javascripts/select2-release-3.2/release.sh
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.css
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.js
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.min
deleted:    vendor/assets/javascripts/select2-release-3.2/select2.png
deleted:    vendor/assets/javascripts/select2-release-3.2/select2x2.png
deleted:    vendor/assets/javascripts/select2-release-3.2/spinner.gif
	-- added select2 gem to make it easier to deal with assets

modified:   app/assets/stylesheets/partials/_annotation_viewer.css.scss
modified:   app/assets/javascripts/angular/controllers/annotation_viewer.js
modified:   app/assets/javascripts/angular/controllers/listen.js
modified:   app/assets/javascripts/angular/filters/filters.js
modified:   app/assets/stylesheets/_base.css.scss
	-- worked on tag resolution (tag id's are now resolved to their proper text)

modified:   app/assets/templates/listen.html
	-- removed unecessary data viewer

modified:   app/serializers/audio_event_serializer.rb
	-- fixed serialization bug (it should send back attached audio_tag_events by defaults,  rather than tags)
recolved merge conflicts