Hooking things together
Merge branch 'master' of github.com:trentio/urbanambassadors

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Put json to /idea/{id}
Fixing things
Merge branch 'master' of github.com:trentio/urbanambassadors

Conflicts:
	src/main/resources/client/edit-project.html