// resize android

Conflicts:

	themes/default-bootstrap/js/global.js