Merge pull request #19 from dejan-brkic/russ_master

fixed null pointer exceptions (spring context and properties)