Merge pull request #51 from COSI236TA/wenbin

add default rule name and default rule description
Added filter to portfolio graphs
Merge branch 'integrate' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/views/iframe/get_portfolio_html.html.erb
Added filter to portfolio graphs
Added filter to portfolio graphs
Added filter to portfolio graphs
Merge pull request #52 from COSI236TA/integrate

Integrate
refine the properties; remove inappropriate properties
fix styles of stock listing and portfolio listing
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
portfolio listing add iframe for the details of the portfolio
Made charts wider, changed class for fancybox to fancybox.ajax
Merge pull request #53 from COSI236TA/integrate

Made charts wider, changed class for fancybox to fancybox.ajax
wider charts,change class fancybox
wider charts
Merge pull request #54 from COSI236TA/integrate

Integrate
unit of target will change according to the selected property
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
clean asset: clean previous precompiled assets