bug fixed
Merge branch 'master' of https://github.com/jegasmlm/dotadev
Heroes view with level role
Heroe view roles ordered by level
Setting Bootstrap
Merge branch 'develop' of https://github.com/jegasmlm/dotadev into develop
code review, documentation and cleanup
layout changes to include correct title and a shitty logo, please fix
adding css
Setting Bootstrap 2
Merge branch 'develop' of https://github.com/jegasmlm/dotadev into develop

Conflicts:
	app/View/Layouts/default.ctp
Heroe View TopRole bug fixed and adding dota server images
fixing conflict HeroeController
New interface 1
Merge branch 'develop' of https://github.com/jegasmlm/dotadev into develop
New interface roles 1
New interface roles 2
new functions in Hero Model and Role Hero Model and adding heroes images
Merge branch 'develop' of https://github.com/jegasmlm/dotadev into develop
Hero index view bug fixed