Merge pull request #13 from clearsightstudio/front-end/thesis-content-and-modal

tweaked the way the edit buttons works / also added a timeout for the ed...
Merge branch 'jamon_improvements' into front-end/thesis-content-and-modal