Merge pull request #25 from nemesisdesign/gestpay_s2s

Gestpay s2s: credit card authentication
Merge pull request #30 from nemesisdesign/gestpay_s2s

Minor improvements and documentation
Merge pull request #33 from nemesisdesign/gestpay_s2s

Invoices / Receipts, UX improvements, security fix.

Also related to: #16 #27 #28 #29
Merge pull request #34 from nemesisdesign/gestpay_s2s

Improvements to credit card registration and minor fixes
radius accountings API draft
improved radius accounting API: cleanup, consistency, backward compatibility
spanish locale
spanish translation stuff
fixed some stuff that causes unworking migration script
changes default permission on cache
fixes some missed translation
Merge branch '1.3'

Conflicts:
	Gemfile.lock
	VERSION
	app/views/accounts/_form.mobile.erb
	config/locales/es.yml
	config/locales/owums.en.yml
	config/locales/owums.es.yml
	config/locales/owums.it.yml
	public/images/locale/es.jpg
	public/javascripts/application.js
Merge branch 'gestpay-es'

Conflicts:
	app/views/layouts/application.html.erb
	config/locales/es.yml
	config/locales/owums.es.yml
	db/fixtures/configurations.yml
	db/migrate/20130314133354_add_roles_to_admin.rb
	public/images/locale/es.jpg