fix for bug USERGRID-22, ICLA - Malaka Mahanama
added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama
ignore templates file
Merge branch 'master' of github.com:usergrid/usergrid
fixed bad check for /users route
Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama
Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama"

This reverts commit e186568e0f32a78fee53b2006691337def1729e3.
Revert "fix for bug USERGRID-22, ICLA - Malaka Mahanama"

This reverts commit dbfd345b9ba68040a6728e794d3742cfd90d3175.
Revert "Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama"

This reverts commit 55dfccacd3a0eecb3a3669fcfd5769ded7618d5c.
Revert "Revert "Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama""

This reverts commit ba4ba33d0258a0b74f7e563e9323876dcf7875e5.
updated android getting started
Merge branch 'update-android-guide'
changing menu so it can be imported
ignore template files
Merge pull request #108 from amuramoto/update-android-guide

updated android getting started
Merge pull request #109 from shawnfeldman/master

Usergrid-130:Make menu dynamic so you can pull in template
Merge pull request #106 from malakaM/113

Addressing Jira Usergrid-113
USERGRID-116 Add Apache license headers to Ruby-Rails SDK
Merge pull request #110 from lewismc/UG-116

USERGRID-116 Add Apache license headers to Ruby-Rails SDK
USERGRID-124 Add Apache license headers to PHP SDK