solve conflicts

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Added GCM Server utility

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Added hibernate database management

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Note : Alert related info db

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Noew fragment for alerts

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Infos for alert

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Link GCMServer

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
Register client for alert and send alert notification

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>
New gitignore

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>