resolve conflict
added jquery folder
addedcategories menu and css file
realy added css file
Merge branch 'master' into history
fix whitespaces in base.html
Merge branch 'master' into dima
remove blank line
Merge pull request #8 from Alerion/dima

Dima
changed name getDashboard to get_dashboard in scr/accounts/models.py
added fancy catogories manu
added fancy menu
changed base.html (added history.js)
history/views.py with right methods name
resolve conflict