Merge pull request #32 from ARmadillo-reuse/unstable

MVP Is ready for demo ( no gcm and timezone support yet )
Merge remote-tracking branch 'upstream/unstable' into unstable
added sqlite3 to gitignore, causing merge problems
Merge pull request #35 from shaladi/unstable

merged alex's changes and added sqlite3 to gitignore