specify required versions of iron router and meteor
Merge pull request #268 from maxwellE/specify_correct_versions_for_meteor_and_iron_router_in_smart_json

specify required versions of iron router and meteor in smart.json
Added Hack on Nitrous.IO button
updating release
Merge branch 'master' of github.com:SachaG/Telescope

Conflicts:
	smart.lock
Merge pull request #271 from gmckeever/master

Added Hack on Nitrous.IO button
Merge branch 'master' of github.com:SachaG/Telescope
working on 0.8
adding packages
using simpleSchema for settings
removing constant and fixing bugs
adding Facebook Login

and a fancy favicon
integrating Facebook profile picture and fixing Facebook integration issues
Merge pull request #273 from keelhaule/facebook-integration

Facebook integration
fixed typo related to profile picture Fetching
Merge pull request #275 from keelhaule/facebook-integration

fixed typo related to profile picture Fetching
Merge branch 'master' of github.com:SachaG/Telescope
Merge branch 'master' into blaze
updating to 0.8.1.1
Merge branch 'blaze' into autoforms

Conflicts:
	.meteor/packages