working on footer
Merge branch 'master' of https://github.com/Collabforge/META-front

Conflicts:
	wp/wp-content/themes/bones/library/css/ie.css
	wp/wp-content/themes/bones/library/css/style.css