Update source code
Update
Update source
Merge branch 'master' of https://github.com/zvoanhkietz/econo-paint

Conflicts:
	.gitignore
	wp-config.php
	wp-content/themes/wootique/custom.css
	wp-content/themes/wootique/header.php
	wp-content/themes/wootique/includes/theme-options.php