css modifications
Merge commit '5e7454fac56c24a6bb2151edbbfb92db4fb432dd'

Conflicts:
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_appearance.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_background-clip.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_background-origin.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_background-size.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_border-radius.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_box-shadow.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_box-sizing.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_box.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_columns.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_filter.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_font-face.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_hyphenation.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_images.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_inline-block.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_opacity.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_regions.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_shared.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_text-shadow.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_transform.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_transition.scssc
	app/templates/.sass-cache/0792476a5e0d14a39905ce7910a9671844ba62a2/_user-interface.scssc
	app/templates/.sass-cache/1b75eb00ac0f38d28218f8cab5de725ca81d1448/_mixins.sassc
	app/templates/.sass-cache/4916e2617e72294e99d67c49caa184778d2541df/_utilities.scssc
	app/templates/.sass-cache/7c8a94bae89fe024597c36dcb1fe3de542d76dc7/_hacks.scssc
	app/templates/.sass-cache/8325602b68c9a2f7a557e56bd2aea13706907510/_css3.scssc
	app/templates/.sass-cache/8325602b68c9a2f7a557e56bd2aea13706907510/_reset.scssc
	app/templates/.sass-cache/8325602b68c9a2f7a557e56bd2aea13706907510/_support.scssc
	app/templates/.sass-cache/cbf419078be0124717ac490fee746221b4778512/_ceaser.sassc
	app/templates/.sass-cache/cbf419078be0124717ac490fee746221b4778512/_ease-types.sassc
	app/templates/.sass-cache/cbf419078be0124717ac490fee746221b4778512/_easing-vars.sassc
	app/templates/_dev/home.php
	app/templates/_dev/sass/main.sass
	app/templates/_dev/styles/main.css