Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'
added help window for rollback tool
added help window for rollback tool
Merge pull request #173 from eestrada/master

Permissions functions are now safely nested in try/except statements
Merge pull request #170 from jmoborn/master

Help window for Rolllback
Merge pull request #174 from eestrada/master

If a texture cannot be overwritten, the exception is caught
Merge pull request #175 from eestrada/master

Texture tool used to report success to the user on failure
Merge branch 'master' of git://github.com/byu-animation/byu-animation-tools