Merge branch 'release' into integration/master

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml

.gitattributes

@@ -1,8 +1,9 @@
 # See https://help.github.com/articles/dealing-with-line-endings
 
-# Handle line endings automatically for files detected as text
-# and leave all files detected as binary untouched.
-* text=auto
+# This setting tells git to always normalize the files specified. 
+# When committed they are stored with LF, on checkout they are 
+# converted to the OS's native line endings.
+* text
 
 # Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.