Merge remote-tracking branch 'upstream-passos/ReorganizeGuideLinks'
Adding "Learn More" link for AeroGear Controller.
Merge branch 'AEROGEAR-748-controller-learn-more'
Improved android guide on eclipse
Fix Android Requirements template
Put back android requirements in guide