before pull aa
after pull  aa
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