beta
Merge branch 'master' of https://github.com/cq-z/yaf_ejemplos

Conflicts:
	public/fonts/glyphicons-halflings-regular.eot
	public/fonts/glyphicons-halflings-regular.svg
	public/fonts/glyphicons-halflings-regular.ttf
	public/fonts/glyphicons-halflings-regular.woff