wat wat
merge
Merge branch 'master' of github.com:vascop/bananawallet

Conflicts:
	templates/index.html
new product + product detail