Merge pull request #111 from mikeemoo/master

Moving to 1.5
re-added resources, updated build
trying to fix the hunk issue
fixing jar layout
moved resources
renamed the output file to "-dev". We don't want any confusion..
added basicomponents assets