Merge branch 'feature/20131122_half_finish_commit' into develop

Conflicts:
	.gitignore
.gitignore UPDATE