Squashed commit of the following:

commit d4331f6607bc0ef1125b5fafc72d9f9eed399514
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Thu Aug 7 16:43:18 2014 -0700

    Incorporate pull comments

commit 0c79e07390faec96da7f3a20f9306fb640a4c6d2
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Wed Aug 6 16:50:53 2014 -0700

    missed removing ${jersey.version} in this pom.xml

commit d71f414e73f3704b9f056a68f8793e8e2b749652
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Wed Aug 6 14:31:21 2014 -0700

    Update with latest pull comments

commit f20216fe0581f9d32c67e07a5383cd6440aa1ecf
Merge: 75eddb0 45b8ffb
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Wed Aug 6 13:00:17 2014 -0700

    Merge branch 'master' of https://github.com/OryxProject/oryx into kam

commit 75eddb04d864937d927a0738f68063e8b9d89005
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Wed Aug 6 12:59:47 2014 -0700

    Fixes to various items flagged during merge

commit bf11f043cf8f311c824ad2fca784cfddbaa2cf21
Merge: 8635b69 ee20364
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Tue Aug 5 14:12:12 2014 -0700

    Merge branch 'master' of https://github.com/OryxProject/oryx into kam

commit 8635b699a0c91d2c0267ee64c8bed036b6d260a2
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Tue Aug 5 14:11:36 2014 -0700

    Updated README.md to document how an application can be loaded

commit 2da8bd2e5854dcb0df65ddcb2eb92a036b396062
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Tue Aug 5 10:38:16 2014 -0700

    align with package renaming. Provide a setting for application-resources until application.conf is integrated

commit e542f646af6c52cfbaeb7786a49147648c0a7626
Merge: dd7da6b 8ae9ef7
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Tue Aug 5 07:55:10 2014 -0700

    Merge branch 'master' into kam

    Conflicts:
    	oryx-common/src/main/resources/reference.conf

commit dd7da6b3e6948a7ce8a76ab389bf1329584bd7c6
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Tue Aug 5 07:42:40 2014 -0700

    added application-resources as an alternative way of loading the application model

commit 79a42ddad909d08d0b5be12d40e42905ad032ee1
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Fri Aug 1 18:33:46 2014 -0700

    added ErrorResponse - returning an error on URI's with are missing a required path param.

commit 2f06c832c14728e9fa36162f4747ba672d8d0047
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Fri Aug 1 17:08:01 2014 -0700

    added a simple test, need to add a mock framework like mockito

commit 9026ecd0286f7f33f68b3ee035eb1eee9303632a
Merge: 9549c6a 9302b5b
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Fri Aug 1 09:16:52 2014 -0700

    Merge branch 'master' into kam

commit 9549c6afc413f338c7e26812db3314efaf2d34fd
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Thu Jul 31 07:51:00 2014 -0700

    remove need to web.xml, initialize OryxApplication in Server.java

commit 65b0f754c80cb66d417b148a3ca30a7909a6a1a6
Merge: 9149ab1 f43a61e
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Thu Jul 31 06:47:17 2014 -0700

    Merge branch 'master' into kam

commit 9149ab1f92c6af20782de730f66a59cfb8269e1a
Author: Kam Kasravi <kamkasravi@yahoo.com>
Date:   Thu Jul 31 06:42:37 2014 -0700

    Allow a model's related servlets to be loaded via a config parameter in reference.conf of serving-layer.model.context-package. This will likely be changed to specific application.conf files ...
I think this should be left at runtime. I'll just tap that in afterwards, don't worry about it.