Migrating flow-router into 2.0

.meteor/packages

@@ -53,8 +53,6 @@ chrismbeckett:toastr
 francocatena:status
 jparker:gravatar
 kevohagan:sweetalert
-meteorhacks:flow-layout
-meteorhacks:flow-router
 meteorhacks:kadira
 mizzao:autocomplete
 mizzao:timesync
@@ -76,3 +74,5 @@ reactive-dict
 yasinuslu:blaze-meta
 nimble:restivus
 dispatch:run-as-user
+kadira:flow-router
+kadira:blaze-layout

.meteor/versions

@@ -56,6 +56,8 @@ jparker:crypto-md5@0.1.1
 jparker:gravatar@0.3.1
 jquery@1.11.3_2
 json@1.0.3
+kadira:blaze-layout@2.0.0
+kadira:flow-router@2.0.0
 kevohagan:sweetalert@1.0.0
 konecty:autolinker@1.0.2
 konecty:change-case@2.3.0
@@ -73,8 +75,6 @@ matb33:collection-hooks@0.7.13
 meteor@1.1.6
 meteor-developer@1.1.3
 meteor-platform@1.2.2
-meteorhacks:flow-layout@1.4.2
-meteorhacks:flow-router@1.19.0
 meteorhacks:kadira@2.22.1
 meteorhacks:meteorx@1.3.1
 meteorspark:util@0.2.0

client/routes/roomRoute.coffee

@@ -4,7 +4,7 @@ FlowRouter.route '/room/:_id',
 	action: (params, queryParams) ->
 		Session.set 'openedRoom', null
 
-		FlowLayout.render 'main', {center: 'loading'}
+		BlazeLayout.render 'main', {center: 'loading'}
 
 		Meteor.defer ->
 			track = Tracker.autorun ->
@@ -42,5 +42,5 @@ FlowRouter.route '/room/:_id',
 					if child?
 						if child.classList.contains('room-container')
 							child.oldScrollTop = child.querySelector('.messages-box > .wrapper').scrollTop
-						child.remove() 
-	]
+						child.remove()
+	]

client/routes/router.coffee

@@ -1,7 +1,7 @@
 Blaze.registerHelper 'pathFor', (path, kw) ->
 	return FlowRouter.path path, kw.hash
 
-FlowLayout.setRoot 'body'
+BlazeLayout.setRoot 'body'
 
 
 FlowRouter.subscriptions = ->
@@ -32,20 +32,20 @@ FlowRouter.route '/home',
 	name: 'home'
 
 	action: ->
-		FlowLayout.render 'main', {center: 'home'}
+		BlazeLayout.render 'main', {center: 'home'}
 		KonchatNotification.getDesktopPermission()
 
 FlowRouter.route '/changeavatar',
 	name: 'changeAvatar'
 
 	action: ->
-		FlowLayout.render 'main', {center: 'avatarPrompt'}
+		BlazeLayout.render 'main', {center: 'avatarPrompt'}
 
 FlowRouter.route '/settings/:group?',
 	name: 'settings'
 
 	action: ->
-		FlowLayout.render 'main', {center: 'settings'}
+		BlazeLayout.render 'main', {center: 'settings'}
 
 FlowRouter.route '/history/private',
 	name: 'privateHistory'
@@ -55,4 +55,4 @@ FlowRouter.route '/history/private',
 
 	action: ->
 		Session.setDefault('historyFilter', '')
-		FlowLayout.render 'main', {center: 'privateHistory'}
+		BlazeLayout.render 'main', {center: 'privateHistory'}