new editable text field + api_key
Resize/DragonFly & Heroku
Add http to locomotivehosting.com link

Add http to avoid ending up at  http://doc.locomotivecms.com/guides/get-started/www.locomotivehosting.com which of course doesn't exist
Merge pull request #49 from jdlich/master

Typo
Update references to ul to nav

Now that the nav drop creates a nav tag with a ul inside it, the id and css attributes affect the nav tag, not the ul tag. Also adjusted to state that no_wrapper removes both of these tags.
Adjusted the sentence about blocks having any name to make more sense
Corrected and added to the documentation for the textile filter.

Previously, the textile filter page incorrectly stated that the RedCloth based filter uses markdown syntax, which it does not.
Added documentation for the distance_of_time_in_words filter.
Update required Rails version (3.2.11 -> 3.2.14)
Note re: starting MongoDB before running locomotive:install generator
content_type/relation page filled + changed the order of pages
typos fixed
Example incorrectly shows using the content_type object 

Following the example using the content_type object to access data collections will result in an error. All other docs correctly instruct to use the contents object to access data collections.
Merge branch 'master' of github.com:locomotivecms/documentation
new version of Wagon (1.3) + fix a bug in the template of the 404 page + new faq entry (close #38)
close #46 (str_modulo)
Merge pull request #47 from benjaminwood/master

Resize/DragonFly & Heroku setup
Merge pull request #48 from jdlich/patch-1

Add http to locomotivehosting.com link
Merge pull request #50 from HashNotAdam/patch-1

Update references to ul to nav
enhance the with_scope tag based on the PR #51