add chat test <view>
add TimeOnline model & test
add time online counter
fixes script <for firefox>
fix admin panel
fix script <time online>
merge dev into 701
assets enabled
Remove assets from application.rb
fix Cap file
remove dploy
Merge pull request #134 from is-valid/701_admin_session_time

701 admin session time
Merge pull request #135 from is-valid/688comments

688comments
Error Alert Notice fixes + post/show fixes
Merge branch 'dev' of github.com:is-valid/ror_team into fix_conflict

Conflicts:
	app/assets/javascripts/messages.js
	app/views/posts/show.html.haml
Merge branch 'fix_conflict' into dev
Merge branch 'dev' into test&fix
admin panel fixes
fix all controller tests
fix <models> tests