fix merge bug
better responsive
merge
fix alarm's popover style
fix modal saving
Merge pull request #2 from aenario/master

Merge yours & mine + bugfixes