fix typo
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
remove market button in header
fix inappropriate property description; capitalize all property names
Rule Update page
---
1. Boostrap style form
2. Able to toggle activated to On or Off
3. Correctly show activated status in dashboard
Merge pull request #69 from COSI236TA/wenbin

Wenbin