need to add hash passwords
changing pathes
removed id on select
select upgraded to normal
Merge conflict
Merge branch 'develop' of github.com:7bits/natural-exchange into develop
Merge branch 'master' of github.com:7bits/natural-exchange