Merge branch 'Applications/16.12'

Authored by sandroandrade on Dec 12 2016, 3:44 AM.

Description

Merge branch 'Applications/16.12'

Merged Changes

CommitAuthorDetailsCommitted
0b935e0480fcsandroandrade
Fix bug in 'give up' button 
Dec 12 2016