20130801
Merge branch 'origin/master'

Conflicts:
	.gitignore