[aerogear-issues] [JBoss JIRA] (AEROGEAR-1622) Merge master with the new-design branch