Preparation for the upcoming Laravel 5. Fixes #29
Merge remote-tracking branch 'upstream/develop' into develop
comments cleanup
add js location
update doc blocks
minor
Merge pull request #6 from chrismichaels84/develop

Develop