Merge branch 'master' of https://github.com/Viewbly/Viewbly

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/images/.DS_Store
	app/assets/images/nav/logo-nav-aqua.png
	app/assets/images/nav/logo-nav-blue.png
	app/assets/images/nav/logo-nav-orange.png
	app/assets/images/nav/logo-nav-purple.png
	app/assets/images/nav/logo-nav-red.png
	app/assets/javascripts/application.js.erb
	app/assets/javascripts/daily_view.js.coffee
	app/assets/javascripts/search.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/daily_view.css.scss
	app/assets/stylesheets/home.css
	app/assets/stylesheets/normalize.css
	app/assets/stylesheets/search.css.scss
	app/controllers/daily_view_controller.rb
	app/controllers/search_controller.rb
	app/helpers/daily_view_helper.rb
	app/helpers/search_helper.rb
	app/models/user.rb
	app/views/daily_view/daily.html.erb
	app/views/layouts/home.html.erb
	app/views/static_pages/home.html.erb
	app/views/user_sessions/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/_user.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	db/migrate/20140907203816_add_admin_to_users.rb
	db/schema.rb
	spec/controllers/daily_view_controller_spec.rb
	spec/controllers/search_controller_spec.rb
	spec/helpers/daily_view_helper_spec.rb
	spec/helpers/search_helper_spec.rb
Fixed merge problems