[aerogear-issues] [JBoss JIRA] (AEROGEAR-1668) Merge Site master to new-design and resolve conflicts