German Translation cont'
bugfix
bugfix2
Merge pull request #378 from xeroc/master

German Translation cont'
Update locale-de.json

Typos, wording, phrasing, ready for BTS Merge
New language: Italian

There are still some rows that must be translated. (Market areas and Short especially) Maybe could be nice a review from another italian. Some specific-fields could be improved when seen in the context. I don't know which other files must be edit to recognize this translation, if someone can tell me, I'll be happy to update them.
Merge pull request #382 from montfalcon/patch-3

New language file: Italian
Merge pull request #381 from KettenBlog/patch-1

Update locale-de.json
Update locale-en.json

Just a couple of typos
Merge pull request #383 from montfalcon/patch-4

Update locale-en.json
Update locale-de.json
Merge pull request #384 from KettenBlog/patch-2

Update locale-de.json
no more priority for higher-collateral
more german translations - finally everything in english
Merge pull request #385 from xeroc/master

german translations + english fix
adds collateral column to open margin orders (issue #386)
Merge branch 'master' into develop

Conflicts:
	app/static/locale-de.json
	app/static/locale-en.json
Merge pull request #389 from vikramrajkumar/develop

Merge master
bootstrap testnet in ruby
fix for issues #390 and #394; also improves unlock and create wallet pages