JUANGABRIEL-16/09/2014

D
Merge remote-tracking branch 'origin/master'

Conflicts:
	PRY_LAPSUS/ProjectSettings/ProjectSettings.asset