Fix Commit

Re-applying all lost changes due to detached head error on 5/20/13
Merge branch 'master' of https://github.com/abestic/loaApp

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/controllers/loas_controller.rb
	app/views/clients/index.html.erb
	app/views/clients/show.html.erb
	app/views/loas/index.html.erb