Merge remote-tracking branch 'upstream/master' into feature-1
load language config for listing all languages in page
updated language files
updated views
updated translation
added view for additional costs bill
generation of additional costs bill - closes #1
Merge branch 'feature-1' into develop