Moving the static html files to a separate folder
Deployed first version of the new web
Merge branch 'feature/summer_2014' of github.com:miguelSantirso/miguelsantirso.es

Conflicts:
	htdocs_static/bienvisto/bienvisto.swf
	htdocs_static/bienvisto/bienvisto_it8.swf
	htdocs_static/bienvisto/images/bienvisto_quickguide.jpg
	htdocs_static/bienvisto/images/node.png
	htdocs_static/bienvisto/images/nodeSelected.png
	htdocs_static/bienvisto/images/nodos.png
	htdocs_static/bienvisto/images/packetflow.png
	htdocs_static/bienvisto/images/quick_bufferSize.png
	htdocs_static/bienvisto/images/quick_nodeSelected.png
	htdocs_static/bienvisto/images/quick_nodesAndLinks.png
	htdocs_static/bienvisto/images/quick_packetflow.png
	htdocs_static/bienvisto/images/quick_receptions.png
	htdocs_static/bienvisto/index.html
	htdocs_static/bienvisto/main.css
	htdocs_static/bienvisto/quick-guide.html
	htdocs_static/favicon.ico
	htdocs_static/img/bienvisto.png
	htdocs_static/img/one_arrow.png
	htdocs_static/img/racing_wings.png
	htdocs_static/img/secret.png
	htdocs_static/img/sourcecookbook.png
	htdocs_static/img/ten_seconds.png
	htdocs_static/img/timeline_icons.psd
	htdocs_static/img/tiny_thief.png
	htdocs_static/img/ululand.png
	htdocs_static/ns3_visualizer/dts_trace-full-compressed.json
	htdocs_static/ns3_visualizer/visualizer.swf