issue #91
issue #91
refactoring, removed unused stuff
Merge remote-tracking branch 'origin/rc' into example_app_2

Conflicts:
	.gitignore
Merge branch 'example_app_2' into rc