Update middleman.gemspec

Bump Uglifier.
Fix dynamic pages link in the config template
Merge pull request #1161 from nybblr/v3-stable

Update Uglifier to 1.4.0 in middleman.gemspec
Merge pull request #1160 from minivan/template-link-fix

Fix dynamic pages link in the config template
prep release
disable sass cache since it cant marshal the path to the MM instance
Update the console to the new logger syntax.
Merge pull request #1163 from jagthedrummer/jeremy/console-fix

Update the console to the new logger syntax.
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0

Conflicts:
	middleman-core/lib/middleman-core/application.rb
use instance hooks provided by hooks instead of changing the gem’s source

Conflicts:
	middleman-core/lib/middleman-core/core_extensions/extensions.rb
as there are no more local changes in the hooks’ source, it can be unvendored and used as gem
Merge pull request #1167 from hagenburger/feature/upgrade-hooks-v3

Feature/upgrade hooks v3
Adding before build hook
Merge pull request #1169 from datapimp/before-build-hook

Adding before build hook
update padrino.
"middleman init" will create a project in the current directory. Fixes #1181.
Prefer loading layouts from `layouts_dir` over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176.
Merge pull request #1185 from bhollis/layout_priority

Prefer loading layouts from `layouts_dir`
Merge remote-tracking branch 'origin/v3-stable'

Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
Fix Padrino integration after merge