Updated .gitignore
Restructure translations
Replaced static strings with dynamic ones.
Merge branch 'i18n_restructure' of github.com:scento/ChatSecureAndroid into scento-i18n_restructure

Conflicts:
	res/values/strings.xml
fix merged strings