Fixed some issues with registration. Small changes on order api
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into wimoto_dev