eclipse complaining
updated controller to use resource
Merge branch 'demo/2_simple_java' into demo/4_simple_profile
merged with demo 3