merrging test
mreging test
changed bootstrap
Merge branch 'history' of https://github.com/Alerion/shopping-helper into test
fixed nav
deleted bootstrap 3
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
merge test
merge test
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
merged test
Merge pull request #24 from Alerion/useradmin

Useradmin
Merge branch 'test' of https://github.com/Alerion/shopping-helper into test
fix problem with map appear
added error.html
erged
modified test for views
added fixtures to unittest
work with tests
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history