fixed CSS conflict between pages
Author: Cole
Commit: Add jquery pubsub plugin.
Author: Cole
Commit: break out functions into classes and implement pubsub messaging
fixed merge conflict in app view
Merge branch 'master' of https://github.com/NeilMakn/kix_rails
Merge pull request #47 from ichabodcole/master

Revert previous javascript change and clean out assets.
Added log in link and deleted a bunch of assets from public
Merge branch 'master' of https://github.com/NeilMakn/kix_rails into logout
Merge pull request #49 from NeilMakn/logout

Added login link and deleted a bunch of assets in public folder
Author: Cole
Commit: Refactor category button and subtask menus into separate classes.
Add additonal view files
Author: Cole
Commit: Add additional javascript view pages
Continue refactoring javascript classes.
Author: Cole
Commit: Add remaining js views
Finish initial pass on modular js branch
Author: Cole
Commit: Refactor js files for more consistent method naming
Add all task page forms and content text where available
Update task naming in side bar to have correct task name
Change sidebar subtask ids from financial and network to fin and net to match db naming scheme
Merge branch 'modular_js'

Conflicts:
	app/assets/javascripts/tasks.js.coffee