bootstrap 3.2
loc redirect
Merge branch 'dev' of github.com:m0x72/food-ninja into dev