Merge pull request #8 from dejan-brkic/russ_master

It compiles!!!!
Merge pull request #9 from dejan-brkic/russ_master

Building not running - duplicate jar files in war
studio starts up (with some ibatis errors)