Missing Type Cast
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	workspace/enwida-web/.settings/org.eclipse.wst.common.component
Merge branch 'origin/master'
switching to master
switching to master
Pushing first stab for navigation