Issue #164 - Use includeSuperClass boolean for keyId property
Issue #164 - sync file with GWT 2.5.1
Survey Translation Styles
Updated gitignore with node_modules
Merge branch 'develop' of github.com:akvo/akvo-flow into feature/deployment

Conflicts resolved in:
	.gitignore