added calculator view
Merge remote-tracking branch 'origin/master'
added calculator to dashboard
calculator submit buttons is working correctly now
Merge remote-tracking branch 'origin/master'