fixed issue
update
Merge branch 'Code_Samples'
Fixing incorrect scope and version override
Adding date-based sorting for Push Message information table

Conflicts:
	model/api/src/main/java/org/jboss/aerogear/unifiedpush/dao/PushMessageInformationDao.java
	model/jpa/src/main/java/org/jboss/aerogear/unifiedpush/jpa/dao/impl/JPAPushMessageInformationDao.java
	model/jpa/src/test/java/org/jboss/aerogear/unifiedpush/jpa/PushMessageInformationDaoTest.java
Merge branch 'date_sorting'
instead of validating an entity from the database, we validate the new from the update form
Merge branch 'AGPUSH-621'
Setting the size for the raw json payload to 4500 and adding tests
:lipstick: for better exception catching + adding missing @Test
tmp. addition of the PKCS12Util for proper validation of iOS certs
Merge branch 'Include_PKCS12Util'
reformat directives.js code with indent=2
AGPUSH-656: correct quantities using pruralization directive
AGPUSH-656: disable link to installation detail when there are no installations
AGPUSH-657: copy font-awesome icon fonts to the path expected by patternfly.css
AGPUSH-696: use Exo2 font-face distributed with admin-ui
generated server/src/main/webapp with updates from admin-ui
AGPUSH-656: fixed pluralization for installations in variant details
Merge branch 'pimping_ui'