Update 2013-03-07
Merge branch 'master' of github.com:welingtonsampaio/lol-framework-documentation

Conflicts:
	app/assets/stylesheets/application.scss