minor fix
cleaning ds store files
before pull aa
after pull  aa
validation and design fixes
advanced search and other fixes
base map controller added and moved the vis
map fixes
pagination added
footer added fixes in pdf maker
results page
carouselback
CSS and file structure changes
Merge branch 'pr/1' into design

Conflicts:
	app/assets/.DS_Store
	app/assets/javascripts/backbone/.DS_Store
	app/assets/javascripts/backbone/apps/.DS_Store

app/assets/javascripts/backbone/apps/main/search/templates/simple_search
_layout.jst.eco
	app/assets/stylesheets/.DS_Store
	app/assets/stylesheets/apps/header.less
ougriemley updates applied
Merge pull request #2 from arminakvn/design

Design
Before Sync
Merge branch 'design' of https://github.com/ougrimley/equitabletod into design

Conflicts:
	app/.DS_Store
Merge pull request #8 from ougrimley/design

Design