changes made in ticket controller and in it views
remove conflicts in schema.rb
Merge branch 'master' of https://github.com/ravensnowbird/foswipe
changes made in show tickets show
removed conflicts in tickets index
changes made in tickets views(show)
removed conflicts