Alex - Playlist
Merge branch 'master' of https://github.com/dudumendes/blender

Conflicts:
	WebContent/META-INF/MANIFEST.MF
	WebContent/javascripts/jquery.autocomplete.js
	WebContent/javascripts/jquery.hint.min.js
	WebContent/javascripts/jquery.validate.min.js
	controle/public/script.js
	controle/public/video-demo.html
	controle/public/video-player.css
	controle/public/video-player.js
	controle/server.js
	controle/views/home.jade
	layout/css/coming-soon.css
	layout/css/content-slider.css
	layout/css/css
	layout/css/fonts.css
	layout/css/gmap.css
	layout/css/images/close-black.png
	layout/css/novecentowide/Novecentowide-Bold-webfont.woff
	layout/css/novecentowide/Novecentowide-Book-webfont.woff
	layout/css/novecentowide/Novecentowide-DemiBold-webfont.woff
	layout/css/novecentowide/Novecentowide-Light-webfont.woff
	layout/css/novecentowide/Novecentowide-Medium-webfont.woff
	layout/css/novecentowide/Novecentowide-Normal-webfont.woff
	layout/css/slideshow.css
	layout/css/style.css
	layout/css/styles.css
	layout/css/symple_shortcodes_styles.css
	layout/css/websymbols/websymbols-regular-webfont.woff
	layout/css/wpml-language-switcher.css
	layout/images/396622_4150605254232_484764986_n.jpg
	layout/images/3darchdecor.jpg
	layout/images/7thteadribbble.jpg
	layout/images/936776_10200997237163928_1940429943_n.jpg
	layout/images/akb_property.jpg
	layout/images/antiqq2.jpg
	layout/images/basvanderveer_tn.png
	layout/images/br-01.jpg
	layout/images/businessmedia.png
	layout/images/dandaka.jpg
	layout/images/dribbble1.jpg
	layout/images/fortaleza_tn.png
	layout/images/jackdaw2.jpg
	layout/images/kf.jpg
	layout/images/klasika2.jpg
	layout/images/krate-04.png
	layout/images/letmesee.jpg
	layout/images/logo-black.png
	layout/images/maymont_tn.png
	layout/images/mirage_tn.png
	layout/images/mirsa.jpg
	layout/images/procrastination_tn.png
	layout/images/qmark-01.jpg
	layout/images/qq.jpg
	layout/images/shapes-tn.jpg
	layout/images/shot_1292050771.jpg
	layout/images/shot_1300752491.jpg
	layout/index.htm
	layout/js/coming-soon.js
	layout/js/content-slider.js
	layout/js/functions.js
	layout/js/gmap.js
	layout/js/iscroll.js
	layout/js/jquery-migrate.min.js
	layout/js/jquery.form.min.js
	layout/js/jquery.gmap.min.js
	layout/js/jquery.js
	layout/js/jquery.mousewheel.js
	layout/js/jquery.ui.accordion.min.js
	layout/js/jquery.ui.core.min.js
	layout/js/jquery.ui.tabs.min.js
	layout/js/jquery.ui.widget.min.js
	layout/js/modernizr.custom.js
	layout/js/portfolio.js
	layout/js/scripts.js

git checkout -b fix