added .m2 directory to ignore
Merge remote-tracking branch 'upstream/1.1' into 1.1