before merge to mapc develop
Merge pull request #7 from MAPC/develop

Develop
advsearch complete before merge with mapc
Merge branch 'pr/8' into design

Conflicts:
	app/assets/images/boxplotsimple08.png

app/assets/javascripts/backbone/apps/abouttod/list/templates/_layout.jst
.eco
	app/assets/javascripts/backbone/apps/fstations/list/list_view.js.coffee

app/assets/javascripts/backbone/apps/main/search/templates/simple_search
_layout.jst.eco
	app/assets/stylesheets/application.css
	app/assets/stylesheets/apps/main.less
Merge pull request #16 from arminakvn/design

Design