first stab at requirements
added orderid and conversion to merchant api
fixed api issues
fixed balance presentation
applied some front page styling
added aditional pages with new style
header view commit extra?
adjusted balance display
Merge branch 'newpage'

* newpage:
  adjusted balance display
  header view commit extra?
  added aditional pages with new style
  applied some front page styling
  fixed balance presentation
  fixed api issues
  added orderid and conversion to merchant api
  first stab at requirements