* changed back to rails 4.1.8 with old Gemfile.lock
* added ctn proxy
Merge branch 'jos-fork' into jos-integration

Conflicts:
	Gemfile.lock
* changed repos source
* some fixes
* fixes
* added configatron
* heavy refactoring from Cardtec
* disabled migration for capistrano
* heavy refactoring
changes card markup and adds ajax property editing
merged upstream