purechat bursa sajadah
Merge remote-tracking branch 'origin/2.0.x' into 2.1.x
Merge remote-tracking branch 'origin/2.1.x'

Conflicts:
	bootstrap/src/main/java/org/soluvas/web/bootstrap/BootstrapPage_middea.html