Added has_tag helper to coreHelpers, added has_tag unit tests. passing OK
Add Customisable Permalinks
Improve image uploader UI

closes #1356
- add button to toggle back to uploader from image-url interface
- put save button next to url-input
- make box-height consistent
- position ui-elements to have equal padding all around to border
Temporary fix for config loader

issue #1521

- Reverting some of the refactor towards including Ghost as a module as it prevented Ghost from loading when no config was available.
Merge pull request #1549 from ErisDS/config-loader-fix

Temporary fix for config loader
fix tag input field

closes #1532
- giving higher priority to css selector for .tag-input in order to override global input-style
- remove padding set by global input-style to align nicely with already set tags
Merge pull request #1533 from jgillich/permalinks

Add Customisable Permalinks
Merge pull request #1550 from bastilian/fix_1532

Fix tag input field
Update base.js

No longer need `|| 'development'`, since it is defaulted in the top index.   If we did need `|| 'development'` here, we'd need it on the next line too, otherwise it breaks.
Merge pull request #1551 from danschumann/patch-1

Update base.js
Merge pull request #1539 from niedbalski/master

[Feature Request] Theme API: add has_tag helper to coreHelpers.
Replace cookieSession with session

- changed cookieSession to session
- added session.regenerate for login and logout
- added bookshelf session store
- added session table to database
- added import for databaseVersion 001
- added grunt task test-api
- cleanup of gruntfile to start express when needed only
- moved api tests to functional tests
add test for allowing 4 underscores in markdown
Modified ghostdown markdown extension to allow for 4+ inline underscores

See #1113
- added additional regex rule to replace 4+ underscores with their coded equivalent: &#95;
Merge pull request #1552 from bastilian/markdown-underscores

Modified ghostdown markdown extension to allow for 4+ inline underscores
Merge pull request #1548 from bastilian/improve_image_uploader_ui

Improve image uploader UI
Merge pull request #1247 from sebgie/bookshelf-session

Replace cookieSession with session
Install in sub-directory support.

refs #527
Merge pull request #1523 from halfdan/527-subdir-support