resolve conflict in web.xml
fix the duplicated api bug
add JsonViews for address and phone
Candace init project
Merge pull request #4 from CandaceC/create

Candace init project
initial addition of end point
init parser layer and factory layer
Merge remote-tracking branch 'origin/master'
initial endpoint addition - after conflicts resolved