Fixing iframe path issues
Merge dev

Conflicts:
	client/app/views/balance.coffee
	client/public/javascripts/app.js
	client/public/javascripts/app.js.map
Locale
Fixed error callback
Bugfixes
Defaults for models
Bugfixes
Code tidying up
Generated javascript
Merge branch 'dev'