added methods that make action not active
added methods that can change info about action, need to write method that update info about action in database
changed css and js files
changed web.xml, added CharacterEncodingFilter
Merge remote-tracking branch 'origin/master'