Merge pull request #19 from COSI236TA/integrate

Integrate
Merge pull request #20 from COSI236TA/integrate

Integrate
replace local lib to remote ones
Merge pull request #21 from COSI236TA/replace_lib

replace local lib to remote ones
modify session control
Merge pull request #22 from COSI236TA/session_bug

modify session control
really fix the problem
Merge pull request #23 from COSI236TA/session_bug

really fix the problem
Merge pull request #24 from COSI236TA/integrate

Added users ettings page, fixed header links
fix problems in session control and helper
Merge pull request #25 from COSI236TA/session_bug

fix problems in session control and helper
modify on new_rule
fix conflict
fixing rules page
fixing bootstrap
Remove files I added by accident
Reset the wrong file
Merge pull request #26 from noranda/bootstrap_fix

Bootstrap fix
fixing rules page
Fixed login check helper