fix problem related to rules and php5.4
add symlink for humidifier
Merge branch 'master' of https://github.com/pcapcanari/arbuz
update importFoxtrotPricelist.sh
add seconds to backup
Merge branch 'master' of https://github.com/pcapcanari/arbuz
weighter changes by Pavel
Merge branch 'master' of https://github.com/pcapcanari/arbuz

Conflicts:
	importFoxtrotPricelist.sh
Merge branch 'master' of https://github.com/pcapcanari/arbuz
adding symlink for blender tpl
merge
fix bug
Merge branch 'master' of https://github.com/pcapcanari/arbuz
fix
Merge branch 'master' of https://github.com/pcapcanari/arbuz
added symlink for clock
Merge branch 'master' of https://github.com/pcapcanari/arbuz
move message at the top
move message at the top
Merge branch 'master' of https://github.com/pcapcanari/arbuz