dashboard
Merge branch 'master' of github.com:monkeythecoder/academia

Conflicts:
	academia
	academia_app/__init__.py
	academia_app/admin.py
	academia_app/models.py
	academia_app/tests.py
	academia_app/views.py
	lib/python2.7/distutils/__init__.py
	lib/python2.7/distutils/distutils.cfg
	lib/python2.7/no-global-site-packages.txt
	lib/python2.7/orig-prefix.txt
	lib/python2.7/site-packages/easy-install.pth
	lib/python2.7/site-packages/setuptools.pth
	lib/python2.7/site.py
	local/include
	local/lib
	media/css/960.css
	media/css/960_12_col.css
	media/css/960_12_col_rtl.css
	media/css/960_16_col.css
	media/css/960_16_col_rtl.css
	media/css/960_24_col.css
	media/css/960_24_col_rtl.css
	media/css/960_rtl.css
	media/css/comments.css
	media/css/demo.css
	media/css/enea.css
	media/css/estilos.css
	media/css/grid.css
	media/css/ie-hacks.css
	media/css/jquery.tweet.css
	media/css/min/960.css
	media/css/min/960_12_col.css
	media/css/min/960_12_col_rtl.css
	media/css/min/960_16_col.css
	media/css/min/960_16_col_rtl.css
	media/css/min/960_24_col.css
	media/css/min/960_24_col_rtl.css
	media/css/min/960_rtl.css
	media/css/min/reset.css
	media/css/min/reset_rtl.css
	media/css/min/text.css
	media/css/min/text_rtl.css
	media/css/reset 2.css
	media/css/reset.css
	media/css/reset_rtl.css
	media/css/social-icons.css
	media/css/style.css
	media/css/superfish.css
	media/css/text.css
	media/css/text_rtl.css
	media/img/1.jpg
	media/img/12_col.gif
	media/img/16_col.gif
	media/img/24_col.gif
	media/img/CTIN.png
	media/img/bg/arbolito.png
	media/img/feature-post-shadow.png
	media/img/featured-border.png
	media/img/front-cover.png
	media/img/headline-bg.png
	media/img/meta-date.png
	media/img/page-title.png
	media/img/reel-left.png
	media/img/reel-right.png
	media/img/shadow-divider.png
	media/img/slider/btn_back.png
	media/img/slider/btn_next.png
	media/img/slider/btn_pause.png
	media/img/slider/btn_play.png
	media/img/social-icons/circular/facebook_32.png
	media/img/social-icons/circular/twitter_32.png
	media/img/tweet-quotes.png
	media/img/wrapper-bg.png
	media/js/custom.js
	media/js/enea.js
	media/js/form-validation.js
	media/js/funciones.js
	media/js/html5shiv.js
	media/js/jquery.catslider.js
	media/js/jquery.min.js
	media/js/modernizr.custom.63321.js
	media/js/mootools-1.2-more.js
	media/js/mootools-1.2.1-core.js
	media/js/mootools-fluid16-autoselect.js
	media/js/mootools-fluid16.js
	media/js/prettyPhoto/css/prettyPhoto.css
	media/js/prettyPhoto/images/prettyPhoto/default/default_thumb.png
	media/js/prettyPhoto/images/prettyPhoto/default/loader.gif
	media/js/prettyPhoto/images/prettyPhoto/default/sprite.png
	media/js/prettyPhoto/images/prettyPhoto/default/sprite_next.png
	media/js/prettyPhoto/images/prettyPhoto/default/sprite_prev.png
	media/js/prettyPhoto/images/prettyPhoto/default/sprite_x.png
	media/js/prettyPhoto/images/prettyPhoto/default/sprite_y.png
	media/js/prettyPhoto/js/jquery-1.4.4.min.js
	media/js/prettyPhoto/js/jquery.prettyPhoto.js
	media/js/prettyPhoto/xhr_response.html
	media/js/quicksand.js
	media/js/script.js
	media/js/slider.js
	media/js/superfish-1.4.8/changelog.txt
	media/js/superfish-1.4.8/css/superfish-navbar.css
	media/js/superfish-1.4.8/css/superfish-vertical.css
	media/js/superfish-1.4.8/css/superfish.css
	media/js/superfish-1.4.8/example.html
	media/js/superfish-1.4.8/images/arrows-ffffff.png
	media/js/superfish-1.4.8/images/shadow.png
	media/js/superfish-1.4.8/js/hoverIntent.js
	media/js/superfish-1.4.8/js/jquery-1.2.6.min.js
	media/js/superfish-1.4.8/js/jquery.bgiframe.min.js
	media/js/superfish-1.4.8/js/superfish.js
	media/js/superfish-1.4.8/js/supersubs.js
	templates/carrusel.html
	templates/enea.html
	templates/font.html
	templates/formulario.html
	templates/head.html
	templates/hola.html
	templates/plantilla.html
	templates/prueba.html
A ver