<WebServer> Fix typo.
<InferenceEngine> Implementing 'apply' + 'checkRule' (To be tested as soon as sunspot.js is fixed)
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from bim9262/master

Added more protection against attacks from command line injection from vlc
<WebServer> Merge.
<Driver> Server were stuck until VLC closed
<WebServices> Fix typos.
<View> Behavior working dynamically.
<WebServer> Fix an error handler.
<Drivers> Adding dbId parameter to the sensors drivers add()
<InferenceEngine> It works, b*tches. :D
<Drivers> Merge VLC.
<Drivers> Relax security for VLC to allow more filenames.
Merge pull request #18 from Aldream/master

Behaviors View + Engine
Merge pull request #6 from PervasiveComputing/master

merge from master